Applied stash to the latest push. To modify specs to properly test app and to match conventions