m4rw3r Simplified some tests

Latest commit 680e664

Aug 14, 2015