Fixed tests
added generator
remove extra stuff