Fixed and updated tests
Merge pull request #30 from mikemases/Labware_Tests

Fixed and updated tests