Adding/running tests.
Added more tests and functionality.