Squashed commit of the following:

commit 779c5cec827845efc3f09d7be65c72fd5e92ac20
Merge: 00c18de 5822f68
Author: Daryl Hedley <darylhedley@hotmail.com>
Date:   Thu Jan 16 01:56:02 2014 -0800

    Merge pull request #5 from adaptlearning/tests

    Adding tests

commit 5822f68c8865e38340f12e4613a8ecedc6d0f200
Author: Kevin Corry <kevinc@learningpool.com>
Date:   Thu Jan 16 09:01:49 2014 +0000

    Adding tests