minor changes
Tests and some methods