Feature tests2

This branch (Feature tests2) has the most updated tests.