Moved bower.json back to root
Added more unit tests