More tests and changes to testing rake task