More tests
Helper methods
New build