Added new tests
merging
Merged changes from SigmundArcturus for testing