[tests, minor] added more tests, cleaned up some minor shit