Tests

Changes made 06/01/14