fixed/added some tests, cleaned up some checks