Unit Tests

- Made test more portable.