How about moving these tests to the unit test area?