#136 Now tests work fine