FixedBug and added a test project