Adding tests.
Ready for push
version #