Added test skeletons.
Merged existing tests.