More tests and setup grunt task