minor changes to put and convert unit tests to teststack