[FIX] has been rewritten in separate files
[TEST] use simon spy methods correctly.