Reordered a few tests
refactored for bower