Added and fixed the test code. Now adjusting to make it work.