Update tests using @test macro
Complete test updating
Merge pull request #26 from magistere/tests

Update tests using @test macro