--- /dev/null
+;;; Gacela, a GNU Guile extension for fast games development
+;;; Copyright (C) 2013 by Javier Sancho Fernandez <jsf at jsancho dot org>
+;;;
+;;; This program is free software: you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation, either version 3 of the License, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+(use-modules (gacela system)
+ (srfi srfi-64))
+
+(test-begin "entities")
+
+(define-component a x y)
+(define-component b)
+
+(define entities (make-entity-set))
+
+; Creating entities
+(set! entities ((new-entity (make-a 1 2) (make-b)) entities))
+(set! entities ((new-entity (make-a 10 20)) entities))
+((new-entity (make-a 10 20)) entities)
+(test-eqv 2 (length (entity-list entities)))
+
+(test-end "entities")