Added basic tests
Added stuff