Adding more test functionality

Still need to think how this should be tested