Test fixes for hw branch

extra block after this deletion
before:
![screenshot from 2014-06-27 17 17 40](https://cloud.githubusercontent.com/assets/5871345/3412942/ed11fe46-fe05-11e3-9162-7ac072bd8c0c.png)

after:
![screenshot from 2014-06-27 17 18 19](https://cloud.githubusercontent.com/assets/5871345/3412945/fbf6adee-fe05-11e3-8dfa-96990fba5e29.png)

fixed in #305