Cleaned up to make 'grunt test' work