added tests
fixed that stupid nop thing
added more tests