cleanup, debug macro
added a bigger test