Start to fix unit tests
Merge pull request #3 from wilsonge/layoutstests

Start to fix unit tests